wayland: Use more explicit out parameter names
authorChris Cummins <christopher.e.cummins@intel.com>
Thu, 28 Mar 2013 14:47:03 +0000 (14:47 +0000)
committerRob Bradford <rob@linux.intel.com>
Tue, 9 Apr 2013 11:52:56 +0000 (12:52 +0100)
Prevent confusion between positional values and hotspot values.

Signed-off-by: Rob Bradford <rob@linux.intel.com>
gdk/wayland/gdkcursor-wayland.c
gdk/wayland/gdkprivate-wayland.h

index fc51473677fe1a07a47f1e137645bebe0b36bf79..25a86de74aed1b9f5593bf72603ba1403fdfc75e 100644 (file)
@@ -183,8 +183,8 @@ gdk_wayland_cursor_get_image (GdkCursor *cursor)
 struct wl_buffer *
 _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
                                 guint      image_index,
-                                int       *x,
-                                int       *y,
+                                int       *hotspot_x,
+                                int       *hotspot_y,
                                 int       *w,
                                 int       *h)
 {
@@ -204,8 +204,8 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
 
       image = wayland_cursor->wl_cursor->images[image_index];
 
-      *x = image->hotspot_x;
-      *y = image->hotspot_y;
+      *hotspot_x = image->hotspot_x;
+      *hotspot_y = image->hotspot_y;
 
       *w = image->width;
       *h = image->height;
@@ -214,8 +214,8 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
     }
   else /* From pixbuf */
     {
-      *x = wayland_cursor->pixbuf.hotspot_x;
-      *y = wayland_cursor->pixbuf.hotspot_y;
+      *hotspot_x = wayland_cursor->pixbuf.hotspot_x;
+      *hotspot_y = wayland_cursor->pixbuf.hotspot_y;
 
       *w = wayland_cursor->pixbuf.width;
       *h = wayland_cursor->pixbuf.height;
index e0789525724a674cb54587aaf64ee8efc7ec1e72..a39893dffc56c41371fd57c6558f7049dddd42aa 100644 (file)
@@ -81,8 +81,8 @@ gboolean   _gdk_wayland_display_supports_cursor_color (GdkDisplay *display);
 
 struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
                                                   guint      image_index,
-                                                  int       *x,
-                                                  int       *y,
+                                                  int       *hotspot_x,
+                                                  int       *hotspot_y,
                                                   int       *w,
                                                   int       *h);
 guint      _gdk_wayland_cursor_get_next_image_index (GdkCursor *cursor,